ext/random: Various minor refactorings #18435
Open
+50
−48
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Girgias
force-pushed
the
random-refacto
branch
from
2bf000c to
905e881
Compare
TimWolla
reviewed
Nov 17, 2025
ext/random/random.c
Outdated
| size_t len = hexstr->len >> 1; | ||
| unsigned char *str = (unsigned char *) hexstr->val, c, l, d; | ||
| const unsigned char *str = (unsigned char *) hexstr->val; | ||
| unsigned char c, l, d; |
Member
There was a problem hiding this comment.
These could also be pulled into the for(). In fact php_hex2bin (which is referenced in the comment above this function) already does. It makes sense to keep the two functions aligned.
ext/random/randomizer.c
Outdated
| } | ||
|
|
||
| non_64: | ||
| non_64: |
Member
There was a problem hiding this comment.
Please drop this one, it's intentional.
Girgias
force-pushed
the
random-refacto
branch
from
905e881 to
038886a
Compare
TimWolla
reviewed
Nov 19, 2025
Member
TimWolla
left a comment
TimWolla
left a comment
There was a problem hiding this comment.
LGTM except the hex2bin changes. Perhaps they should be done in a separate PR, since they are fixing an actual bug?
| const unsigned char *str = (unsigned char *) ZSTR_VAL(hexstr); | ||
| unsigned char *ptr = (unsigned char *) dest; | ||
| int is_letter, i = 0; | ||
| uint32_t i = 0; |
Member
There was a problem hiding this comment.
This one is a uint32_t used as an offset. Please:
Suggested change
| uint32_t i = 0; | |
| size_t i = 0; |
Alternatively pointer arithmetic could be used on str.
| size_t len = hexstr->len >> 1; | ||
| unsigned char *str = (unsigned char *) hexstr->val, c, l, d; | ||
| const unsigned char *str = (unsigned char *) ZSTR_VAL(hexstr); | ||
| unsigned char *ptr = (unsigned char *) dest; |
Member
There was a problem hiding this comment.
Suggested change
| unsigned char *ptr = (unsigned char *) dest; | |
| unsigned char *ptr = dest; |
Unnecessary cast from void*.
| size_t target_length = oldlen >> 1; | ||
| zend_string *str = zend_string_alloc(target_length, 0); | ||
| unsigned char *ret = (unsigned char *)ZSTR_VAL(str); | ||
| size_t i, j; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commits should be reviewed in order.